From: Colin Walters <walters@verbum.org>
Date: Tue, 16 Dec 2014 03:55:56 +0000 (-0500)
Subject: repo: Minor cleanup: Move size generation code initialization
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~1013
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=abb88336b316a015024ec42cbdebdad772540ca8;p=ostree.git

repo: Minor cleanup: Move size generation code initialization

It has a global effect, so do it in the entrypoint.
---

diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index 9d970e4a..6161f2b5 100644
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -2109,11 +2109,6 @@ write_directory_to_mtree_internal (OstreeRepo                  *self,
 
   g_debug ("Examining: %s", gs_file_get_path_cached (dir));
 
-  if (modifier && modifier->flags & OSTREE_REPO_COMMIT_MODIFIER_FLAGS_GENERATE_SIZES)
-    {
-      self->generate_sizes = TRUE;
-    }
-
   /* If the directory is already in the repository, we can try to
    * reuse checksums to skip checksumming. */
   if (OSTREE_IS_REPO_FILE (dir) && modifier == NULL)
@@ -2233,6 +2228,11 @@ ostree_repo_write_directory_to_mtree (OstreeRepo                *self,
   gboolean ret = FALSE;
   GPtrArray *path = NULL;
 
+  if (modifier && modifier->flags & OSTREE_REPO_COMMIT_MODIFIER_FLAGS_GENERATE_SIZES)
+    {
+      self->generate_sizes = TRUE;
+    }
+
   path = g_ptr_array_new ();
   if (!write_directory_to_mtree_internal (self, dir, mtree, modifier, path,
                                           cancellable, error))